From af7b3df659d11d2cb3356bb7450bf1d212a88c04 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Fri, 7 Jun 2019 10:46:42 +0200 Subject: [PATCH] Adwaita: update treeview progressbars - The style resembles Clearlooks and is way outdated. https://gitlab.gnome.org/GNOME/gtk/issues/1938 --- gtk/theme/Adwaita/_common.scss | 27 ++++-------------------- gtk/theme/Adwaita/gtk-contained-dark.css | 26 +++++++++++------------ gtk/theme/Adwaita/gtk-contained.css | 24 ++++++++++----------- 3 files changed, 29 insertions(+), 48 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index a9b363d350..62cd4b871b 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1873,36 +1873,26 @@ treeview.view { &.progressbar { // progress bar in treeviews @if $variant == light { color: $base_color; } - border: 1px solid $selected_borders_color; - border-radius: 4px; background-color: $selected_bg_color; - background-image: linear-gradient(to bottom, - $selected_bg_color, - darken($selected_bg_color, 10%)); - box-shadow: inset 0 1px if($variant=='light', transparentize(white, 0.7), transparentize(white, 0.85)), - 0 1px if($variant=='light', transparentize(black, 0.8), transparentize(black, 0.9)); + background-image: image($selected_bg_color); + box-shadow: none; &:selected { &:focus, & { - border-radius: 4px; @if $variant == 'light' { color: $selected_bg_color; - box-shadow: none; + } @else { box-shadow: inset 0 1px transparentize(white, 0.95); } - background-image: linear-gradient(to bottom, $base_color, darken($base_color,10%)); + background-image: image($base_color); &:backdrop { @if $variant == 'light' { color: $selected_bg_color; - border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?) } - - @else { border-color: $backdrop_base_color; } - background-color: $backdrop_base_color; } } @@ -1911,8 +1901,6 @@ treeview.view { &:backdrop { @if $variant == 'light' { color: $backdrop_base_color; } - @else { border-color: $backdrop_base_color; } - background-image: none; box-shadow: none; } @@ -1920,20 +1908,13 @@ treeview.view { &.trough { // progress bar trough in treeviews background-color: transparentize($fg_color,0.9); - border-radius: 4px; &:selected { &:focus, & { background-color: if($variant == 'light', transparentize($selected_fg_color, 0.7), darken($selected_bg_color, 10%)); - border-radius: 4px; - @if $variant == 'light' { - border-width: 1px 0; - border-style: solid; - border-color: $selected_bg_color; - } } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index fe1d6dfb2a..25feb75bc1 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -773,17 +773,17 @@ treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symb treeview.view.expander:backdrop { color: #747473; } -treeview.view.progressbar { border: 1px solid #030c17; border-radius: 4px; background-color: #15539e; background-image: linear-gradient(to bottom, #15539e, #0f3b71); box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), 0 1px rgba(0, 0, 0, 0.1); } +treeview.view.progressbar { background-color: #15539e; background-image: image(#15539e); box-shadow: none; } -treeview.view.progressbar:selected:focus, treeview.view.progressbar:selected { border-radius: 4px; box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: linear-gradient(to bottom, #2d2d2d, #141414); } +treeview.view.progressbar:selected:focus, treeview.view.progressbar:selected { box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#2d2d2d); } -treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { border-color: #303030; background-color: #303030; } +treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { background-color: #303030; } -treeview.view.progressbar:backdrop { border-color: #303030; background-image: none; box-shadow: none; } +treeview.view.progressbar:backdrop { background-image: none; box-shadow: none; } -treeview.view.trough { background-color: rgba(238, 238, 236, 0.1); border-radius: 4px; } +treeview.view.trough { background-color: rgba(238, 238, 236, 0.1); } -treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: #0f3b71; border-radius: 4px; } +treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: #0f3b71; } treeview.view header button { color: #8e8e8d; background-color: #2d2d2d; font-weight: bold; text-shadow: none; box-shadow: none; } @@ -810,15 +810,15 @@ menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #353535; } -menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } +menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; } -menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } +menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } -menubar > menuitem menu menu, .menubar > menuitem menu menu { border-radius: 0; padding: 0; } +menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; } -menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; } +menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; } -menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #919190; box-shadow: none; } +menubar > box > menuitem:disabled, .menubar > box > menuitem:disabled { color: #919190; box-shadow: none; } menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0; } @@ -2029,12 +2029,12 @@ popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6 popover.emoji-picker .emoji :hover { background: #15539e; } -popover.emoji-completion arrow { border: none; background: none; } - popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; } popover.emoji-completion .emoji:hover { background-color: #424242; } +popover.entry-completion contents { padding: 0; } + /* GTK NAMED COLORS ---------------- use responsibly! */ /* widget text/foreground color */ diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 3c50e150fb..ca4308d9af 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -781,17 +781,17 @@ treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symb treeview.view.expander:backdrop { color: #b2b4b4; } -treeview.view.progressbar { color: #ffffff; border: 1px solid #185fb4; border-radius: 4px; background-color: #3584e4; background-image: linear-gradient(to bottom, #3584e4, #1b6acb); box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px rgba(0, 0, 0, 0.2); } +treeview.view.progressbar { color: #ffffff; background-color: #3584e4; background-image: image(#3584e4); box-shadow: none; } -treeview.view.progressbar:selected:focus, treeview.view.progressbar:selected { border-radius: 4px; color: #3584e4; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); } +treeview.view.progressbar:selected:focus, treeview.view.progressbar:selected { color: #3584e4; background-image: image(#ffffff); } -treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { color: #3584e4; border-color: #185fb4; background-color: #fcfcfc; } +treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { color: #3584e4; background-color: #fcfcfc; } treeview.view.progressbar:backdrop { color: #fcfcfc; background-image: none; box-shadow: none; } -treeview.view.trough { background-color: rgba(46, 52, 54, 0.1); border-radius: 4px; } +treeview.view.trough { background-color: rgba(46, 52, 54, 0.1); } -treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: rgba(255, 255, 255, 0.3); border-radius: 4px; border-width: 1px 0; border-style: solid; border-color: #3584e4; } +treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: rgba(255, 255, 255, 0.3); } treeview.view header button { color: #979a9b; background-color: #ffffff; font-weight: bold; text-shadow: none; box-shadow: none; } @@ -818,15 +818,15 @@ menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; } -menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } +menubar > box > menuitem, .menubar > box > menuitem { min-height: 16px; padding: 4px 8px; } -menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } +menubar > box > menuitem menu, .menubar > box > menuitem menu { border-radius: 0; padding: 0; } -menubar > menuitem menu menu, .menubar > menuitem menu menu { border-radius: 0; padding: 0; } +menubar > box > menuitem menu menu, .menubar > box > menuitem menu menu { border-radius: 0; padding: 0; } -menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; } +menubar > box > menuitem:hover, .menubar > box > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; } -menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #929595; box-shadow: none; } +menubar > box > menuitem:disabled, .menubar > box > menuitem:disabled { color: #929595; box-shadow: none; } menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0; } @@ -2045,12 +2045,12 @@ popover.emoji-picker .emoji { font-size: x-large; padding: 6px; border-radius: 6 popover.emoji-picker .emoji :hover { background: #3584e4; } -popover.emoji-completion arrow { border: none; background: none; } - popover.emoji-completion contents row box { border-spacing: 10px; padding: 2px 10px; } popover.emoji-completion .emoji:hover { background-color: white; } +popover.entry-completion contents { padding: 0; } + /* GTK NAMED COLORS ---------------- use responsibly! */ /* widget text/foreground color */ -- 2.30.2